Ifdef stuff that is XEN specific in patches

Signed-off-by: Emmanuel Ackaouy <ack@xensource.com>

diff --git a/patches/linux-2.6.16.13/net-csum.patch b/patches/linux-2.6.16.13/net-csum.patch
index 44ce24679361b53e3b3feee6bfd75d0b57417d3f..c99e0506b2d5ea75586f5b99a4fa86c8da9449a7 100644 (file)
--- a/patches/linux-2.6.16.13/net-csum.patch
+++ b/patches/linux-2.6.16.13/net-csum.patch
@@ -1,40 +1,39 @@
 diff -pruN ../pristine-linux-2.6.16.13/net/ipv4/netfilter/ip_nat_proto_tcp.c ./net/ipv4/netfilter/ip_nat_proto_tcp.c
 --- ../pristine-linux-2.6.16.13/net/ipv4/netfilter/ip_nat_proto_tcp.c  2006-05-02 22:38:44.000000000 +0100
-+++ ./net/ipv4/netfilter/ip_nat_proto_tcp.c    2006-05-04 17:41:37.000000000 +0100
-@@ -129,10 +129,14 @@ tcp_manip_pkt(struct sk_buff **pskb,
++++ ./net/ipv4/netfilter/ip_nat_proto_tcp.c    2006-05-16 13:28:19.000000000 +0100
+@@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
        if (hdrsize < sizeof(*hdr))
                return 1;
  
 -      hdr->check = ip_nat_cheat_check(~oldip, newip,
-+      if ((*pskb)->proto_csum_blank) {
++#ifdef CONFIG_XEN
++      if ((*pskb)->proto_csum_blank)
 +              hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
-+      } else {
++      else
++#endif
 +              hdr->check = ip_nat_cheat_check(~oldip, newip,
                                        ip_nat_cheat_check(oldport ^ 0xFFFF,
                                                           newport,
                                                           hdr->check));
-+      }
-       return 1;
- }
- 
 diff -pruN ../pristine-linux-2.6.16.13/net/ipv4/netfilter/ip_nat_proto_udp.c ./net/ipv4/netfilter/ip_nat_proto_udp.c
 --- ../pristine-linux-2.6.16.13/net/ipv4/netfilter/ip_nat_proto_udp.c  2006-05-02 22:38:44.000000000 +0100
-+++ ./net/ipv4/netfilter/ip_nat_proto_udp.c    2006-05-04 17:41:37.000000000 +0100
-@@ -113,11 +113,16 @@ udp_manip_pkt(struct sk_buff **pskb,
++++ ./net/ipv4/netfilter/ip_nat_proto_udp.c    2006-05-16 13:30:14.000000000 +0100
+@@ -113,11 +113,17 @@ udp_manip_pkt(struct sk_buff **pskb,
                newport = tuple->dst.u.udp.port;
                portptr = &hdr->dest;
        }
 -      if (hdr->check) /* 0 is a special case meaning no checksum */
 -              hdr->check = ip_nat_cheat_check(~oldip, newip,
 +      if (hdr->check) { /* 0 is a special case meaning no checksum */
-+              if ((*pskb)->proto_csum_blank) {
++#ifdef CONFIG_XEN
++              if ((*pskb)->proto_csum_blank)
 +                      hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
-+              } else {
++              else
++#endif
 +                      hdr->check = ip_nat_cheat_check(~oldip, newip,
                                        ip_nat_cheat_check(*portptr ^ 0xFFFF,
                                                           newport,
                                                           hdr->check));
-+              }
 +      }
        *portptr = newport;
        return 1;